rfkill: Consider HasAirplaneMode

`ShouldShowAirplaneMode` only considers whether airplane mode
should be shown for the form factor, not whether there are
any actual kill switches available.

That's tracked in a separate property, `HasAirplaneMode`.

Take that into account for our `:show-airplane-mode` property,
so that it reflects when airplane mode should and *can* be shown.

Right now we only show airplane mode when it is enabled (and
therefore available), but this will change in the future.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2385>

diff --git a/data/dbus-interfaces/org.gnome.SettingsDaemon.Rfkill.xml b/data/dbus-interfaces/org.gnome.SettingsDaemon.Rfkill.xml
index 628b17ff9882abe50d9461625c9721d5f3b7cac2..bde65f95710ca21d193cbb00346401499180450d 100644 (file)
--- a/data/dbus-interfaces/org.gnome.SettingsDaemon.Rfkill.xml
+++ b/data/dbus-interfaces/org.gnome.SettingsDaemon.Rfkill.xml
@@ -1,6 +1,7 @@
 <node>
   <interface name="org.gnome.SettingsDaemon.Rfkill">
     <property name="AirplaneMode" type="b" access="readwrite"/>
+    <property name="HasAirplaneMode" type="b" access="read"/>
     <property name="HardwareAirplaneMode" type="b" access="read"/>
     <property name="BluetoothAirplaneMode" type="b" access="readwrite"/>
     <property name="BluetoothHasAirplaneMode" type="b" access="read"/>

diff --git a/js/ui/status/rfkill.js b/js/ui/status/rfkill.js
index 332d1643f46aea5187fa2aec4625166000ecbcb8..798d771cd043dfdfa4ccf9e76bf90b6beebb86f7 100644 (file)
--- a/js/ui/status/rfkill.js
+++ b/js/ui/status/rfkill.js
@@ -60,7 +60,7 @@ const RfkillManager = GObject.registerClass({
     }
 
     get show_airplane_mode() {
-        return this._proxy.ShouldShowAirplaneMode;
+        return this._proxy.HasAirplaneMode && this._proxy.ShouldShowAirplaneMode;
     }
     /* eslint-enable camelcase */
 
@@ -73,6 +73,7 @@ const RfkillManager = GObject.registerClass({
             case 'HardwareAirplaneMode':
                 this.notify('hw-airplane-mode');
                 break;
+            case 'HasAirplaneMode':
             case 'ShouldShowAirplaneMode':
                 this.notify('show-airplane-mode');
                 break;